This reverts commit cb5e62cc. Reason for revert: cause of regression b/156874301 Fixes: 156874301 Change-Id: If88f1d508180ae7b2e40f11386d5a6b66b639750