Merge commit '88932754' into nyc-mr1-dev-plus-aosp am: 6a688ca1 -s ours am: b7050f52 Change-Id: Iaaba0c8dd7181a5560158c47e817d31c25d8dbf6