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

Change-Id: I8591cfa0ac94a3dd13c97a596e48f7647adda69f