Merge "Partially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
am: 2cdfda1232

Change-Id: If3060eb7b21a3bb5f6b34b36de012cb35e4f03c9