Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into oc-dev am: 71bd839856
am: 262d6935a0

Change-Id: Ic9027e92228853ab6dffacf72c0afc3920946d19