This reverts commit 1daf973605. Reason for revert: Regression in SW. Bug:162499840 Change-Id: I0e846efcc4fc06b53d97b2007e0d8e8f97c6ac10
1daf973605