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

Change-Id: I81bd7cd7cbc73db6c216d02f53dfca3d3be19802