Merge changes from topic "am-710d603e-2dfd-4779-8a9e-e8fd1e2198ef" into oc-dev am: dd9737ba12 am: e85871c70c
am: 05cb965810

Change-Id: I9833c30648e09460fe0df58f856fc05459647f9c