Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev
am: 7aa1ca5851

Change-Id: I5f14de69e62b1053e33e6ab03c11b6dd9b87f27f