Merge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev
am: 2ef9262f9a

Change-Id: I5323f77b9f57eced0ee22e387a989e4532409235