This reverts commit 8adb39a688.
Reason for revert: Regression in SW. Bug:162499840
Change-Id: Ic93e762e41a728f66e200e5bc8e40ebe4c7b44f7
This reverts commit 8adb39a688.
Reason for revert: Regression in SW. Bug:162499840
Change-Id: Ic93e762e41a728f66e200e5bc8e40ebe4c7b44f7