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

Change-Id: I0848db36a725f6b1ebf1b1877b4278bc68001c11