This reverts commit c568477004.
Reason for revert: API concerns.
Bug: 129901520
Change-Id: I658de3933353ac93b13ce1f6f6616fd653663152
This reverts commit c568477004.
Reason for revert: API concerns.
Bug: 129901520
Change-Id: I658de3933353ac93b13ce1f6f6616fd653663152