Merge changes from topic "am-f061ea53bac043638c1945db8b28ea56" into oc-dev am: 3875794b69 am: 59a6479664
am: 7efb78b047

Change-Id: I088030e23345c6dd78372a5295a0ef423275fa76