Merge changes from topic "am-a7843e11fb1e4c56bdc3daa910f738bb" into oc-dev am: 64c5e54e64
am: 4eb42d0eb7

Change-Id: I88518267b12f78820623010d416d7cb47bee18b1