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

Change-Id: Ic4b97b9d378f379bfbc00c6d2566c1712a2edf07