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

Change-Id: Ia3164a0c4438cb025601f62b097f83f77a69358f