Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev
am: 391c549642

Change-Id: I23c36b39ad9c0ab44bad9c7970617974d2d109f1