Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp am: 6a688ca1ad  -s ours
am: b7050f527e

Change-Id: Iaaba0c8dd7181a5560158c47e817d31c25d8dbf6