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

Change-Id: I4042e5306cec8fc8111d67085d71911049dea240