Merge changes I768830f5,I665bde3a into oc-mr1-dev
am: 7876b630be

Change-Id: I5003402a9e3c552cf99846ec9dc538984a65c0c6