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

Change-Id: I4ce85a955b56ca7750ccc135e3428bf735f71681