Merge changes I70f79400,I2f8cab37 into oc-dev
am: bb790ca951

Change-Id: Ie5286397f0b0e28732e142d6cd31ccfd9d1c19a7