Merge changes from topic 'am-c9f68e2ccbd44528a6b26bcf72215e4f' into nyc-mr2-dev-plus-aosp
am: 913d779eb4

Change-Id: I5529af4483b344bd4f72266e80afcc50b8159d30