This reverts commit fa27a88292.
The original was only a temporary revert in order to remove from initial beta release for dogfooding before the feature was ready.
Reason for revert: b/123652115
Bug:123652115
Test: manual
Change-Id: Id647c2992e30289d72a4f6144829a997677be3fa