[automerger] Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8-lmp-mr1-dev" into nyc-dev am: bb43488d13 am: 894028fed2 am: 361b14ce54

Change-Id: I2d9f052b54629c299b31c7b17d64840954cdecf4