Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into nyc-mr2-dev
am: 6052f446a4

Change-Id: Id319a7b5e68a8073bb76febe7bc51d044d5b4c78