Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea
am: 7557661787

Change-Id: I543dafa974e9f5c677957fd19d6f03fcf796213a