Merge changes I858017b8,Ife32b600 into oc-dev
am: 63e8bfe1c5

Change-Id: Ib280d1e343d5765ea93edcfbc5aae21417e6c590