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

Change-Id: Ia5f75e7567def8fe0104669cf37a586372456d62