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

Change-Id: I8a3c2a4714a8a48fc9c190d9ea15900e17db952b