Merge "Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into lmp-mr1-dev am: 1dd89e7798" into lmp-mr1-app-dev
am: b2184c8dc1

Change-Id: I42c60da79e6b4eaf9672f8c19be8348010a9dbf6