Merge "Do not enforce unlocked state when there is no caller" into nyc-dev
am: b9f7541d9b

* commit 'b9f7541d9bd8b0b37f04ea8244a8d0bd5fb97717':
  Do not enforce unlocked state when there is no caller

Change-Id: I2b8b00a730e7b0b27da6ad360b76c82c6bc1b178