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

Change-Id: Ia4d3883803cdf91f0459e8549523cadb64afba51