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

Change-Id: If227a53d23040179fb7a5cf8838224decc1420aa