Merge changes I13bba845,Ic48071c8,Ie5834b80,I562b2bcf,I441522f5, ... into oc-mr1-dev am: 9fc75ff97e
am: e3c1277d79

Change-Id: I16d8c9fe3cb0fdfde87ef4eeab0ca675f68904de