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

Change-Id: I337eff8e14e63e9a615a463e6f6d74d71feed7ff