[automerger] Merge changes from topic "am-487b3a4e-6c35-49a5-a21b-805401f2196b" into nyc-dr1-dev am: b8469ec290 am: 84174b0286

Change-Id: I6a205f9cd96e8de36336cdff2237c30fe8b4d375