Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev
am: 4feca3b99f

Change-Id: Id02665871c6b93b03fa1294278e3cb8513811b5e