Merge changes I22b55b73,Id050f2f5 into oc-dev am: d8d7a283bd
am: 324b399798

Change-Id: I1b8d5eb716a80f26370e3e46d587a9a4922c343e