[automerger] Merge changes from topic "am-db8c42ea-b1e6-42b0-85eb-9b241b1e6d97" into nyc-dr1-dev am: af06ff223c am: acb0be7631

Change-Id: I7a823caa2a3d5b2772de7359585b848e91fb3386