Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into oc-dev
am: 91abb3dac8

Change-Id: I436b0361983489182d5910aab2e81230674ed8c6