[automerger] Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into nyc-dr1-dev am: 72c25a33 am: 99d693c8 am: 29819a74 Change-Id: If07a3d5478056ca5e48c5fc18c1f6004020bebe9