Merge \\"Restore old signature for acquire/release session\\" into nyc-dev am: ef9cab1d86
am: dc43ff40e3

Change-Id: Iba6e3366410bf7d15d77f5d11197ece1eb73495e