Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev am: 33be0d800a
am: e90b1d120c

Change-Id: If426bf2027c4630fcf7673752e324ab8bbceac55