Merge changes from topic 'am-b2b498ad339f46b6b041f9498a05fda7' into nyc-mr1-dev-plus-aosp
am: 8628bbc5e0

Change-Id: Ib598c99972632b6884baf87da0a0834cf68d4592