Merge changes Iec369a50,I78959464,I3f9f8d56 into oc-dev
am: ad8d533a04  -s ours

Change-Id: Ib512088973257b638da1be19a6d4b84f6e0a71f6