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

Change-Id: I2de74604cdf21c4535904f9c913392952943d3b5