Merge changes I8d149ab0,Ia0a52819,If54a89cb,I20faa733,Ib32dfd23 into oc-dev am: 07ea44909f
am: 63ca3e2414

Change-Id: Ieb34996878d9689e2bd29590a302a95dd7d2d83c