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

Change-Id: I01bf6ef90893ec81b867b1f5ead2ec2d5fd563ff