Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5
am: e14c028ff7

Change-Id: I8164075e19cd75d4caa429dacc685f8caac49da4