Merge changes Ifbeed546,Ia283252d,I28c85736 into oc-dr1-dev
am: c9f75f818c  -s ours

Change-Id: Ifa98659370f618ca05f18550b65c48d63aeba4af