Merge changes from topic "am-538bf8fd-0fa8-4c10-aeea-2cd19adfb09f" into oc-dev am: 65e0be10ae
am: 624190b5cd

Change-Id: Ie0d46880de5b88e4f1ddabc5e645de5363732a78