Merge \"Improve initial unlock delay (1/2)\" into nyc-mr1-dev
am: 165b011a74

Change-Id: Ib7bfefcd59288d144a22434e5a99124c66fa4826