Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812 am: c7d9294cd9
am: a8772230d1

Change-Id: I6e8c1621575844b038be0ea8489e4c0561f38e38