Merge changes from topic "am-1fb2f9b6011849d595f6e5c286f9e769" into nyc-dr1-dev
am: 35242b0304

Change-Id: I1da05e70e7d3a67f2b4072c57e0682b77d2ed029