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

Change-Id: I7c7a58b90d374cad43ef3e749be4cc03777e29c9