Merge changes I9da985a7,I2bd642aa,I9358b3c9,I9d3c60b1 into oc-dev
am: 62dc1344e0

Change-Id: I473b1f54ff0322ecc2a99a732bd17a302a8967a2