Merge \"Revert \"Restore old signature for acquire/release session\"\" into nyc-dev
am: 6e70614750

Change-Id: Icbbcfdbbfce7ce8f00e40e58c9a13d1a1a245f37