Sync with google3 version.

Test: Tested that it works on device.

Bug: 36838725
Change-Id: I61747fc619bd7ee298e828d2fd9705f3531a233f
22 files changed