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

Change-Id: I45717cc23cf5eab8581cd0c37d3aa2bdb4a9945e