This reverts commit 384250c7. Reason for revert: Relanding the feature. Bug: 233029164 Change-Id: Ib66deabbf6e9604798c70edaf581f46db848e6ca