Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am: 46fc48f57e
am: b39e49d52c

Change-Id: Iaf02c5ebdb656fc79cde201e6df97760283ea4e4