Merge changes from topic "am-31b2f52e-df04-44ea-aeac-e5b3f97ccf5a" into oc-dev am: 47ffdeac am: c12ffbf5 am: baecabe0 Change-Id: I6cbedf6e91a0cc66b654aae92adb1c2af6fa9910