Merge commit 'accde60f09508f9543a094247ed95ce2ae605912' into nyc-mr1-dev-plus-aosp
am: fe11efd868

Change-Id: I233aae780b04a72e6f11790eb143e05eb541d66c