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

Change-Id: Ie5af8a39ffc8709b0d804927b2db5d13871492e0