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

Change-Id: Id26bc89dfc8ac5575293d4f9e8c241a66742c3a2