Merge changes from topic "am-89fe5346-d048-4a7e-b219-5691d6788fba" into oc-mr1-dev
am: 8d35fd363c

Change-Id: I016a6c11c8dea9544f254869b36f2d400612ebf1