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

* commit '35c6f6c70a22987d0166500909f21d4d339dd1ae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Id285c9fa289daad5c272ae7ca35d696c389c9168