Merge commit '5bb9b8b' into nyc-dev-plus-aosp
am: 42d7541899

Change-Id: Ie337f1c9da8417400bd86fcb140a68d5afb9c9a9