This reverts commit 29100e88. Reason for revert: Regression in SW. Bug:162499840 Change-Id: I96bf28ffc9f2d8f3838cb6d2dac16f89a70177ed