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

Change-Id: Icf4cf5e8e95b9de4b313f826a40c1df81c02aa8a