Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae am: 35c6f6c70a
am: c68126587a

* commit 'c68126587aab22d27cf6ad19a05cb58b5d1bad50':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: I9a24147c091c7f370923e43148b78a855fcb43be