Merge "Optimize latency when unlocking phone" into oc-dev
am: b114e4ff82

Change-Id: Ibf9b7f59c6b5d86116dc4405f6ac22f527eb8f8a