This reverts commit dc1bbc2d. Reason for revert: b/198050304 Fixes: 198050304 Change-Id: If5eec6f3749f0fe20fdf6b1b63fdc02e6ddcab57