Merge changes from topic "am-c3548d64-0940-4c1d-b786-8c3f6bfc3870" into oc-mr1-dev am: db14d3a991
am: c94718ba7e

Change-Id: I482051f390d7451a5dddb5ac5dd94fa3acfa578e