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

Change-Id: Id2a604cf81ce8f44739365d77d5777caccf76220