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

Change-Id: I8939374ea8d76af5c4655bdd0db0084988ce5ede