This reverts commit b87dc233. Reason for revert: Regression in SC, tracked in Bug: 175668832 Change-Id: I13387ae4aa89ba4b5d409afd3c5eb78e473a8064