Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev am: ef0d8b44 am: d72f7d1d am: c9bdb753 Change-Id: Ie6d5f985739a9ff83eb66bb74173cc6d867a06f2