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

Change-Id: Ib7bfefcd59288d144a22434e5a99124c66fa4826
2016-07-08 22:08:37 +00:00
..
2016-06-03 04:50:16 -07:00