Merge changes Ib29b3920,Ice5efad9 into oc-dev
am: 1e8b19d211

Change-Id: I827f5078fe865d84b724b84db464b798f2405c88