Merge commit 'accde60f09508f9543a094247ed95ce2ae605912' into nyc-mr1-dev-plus-aosp

Change-Id: I732a9b0bb6e569be342a6df3640f4e539f9ccce0