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

Change-Id: I580afa37d19c8b9fd43428768c1047199797712c