[automerger] Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into nyc-dev am: 54fff8435f am: c9da253f9e am: 6940b77b14

Change-Id: I738b10751582d19e52ffa2a9817a0853af91f87f