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

Change-Id: I0a96ee23c71da627b976fa5da400d0f027b32462