This reverts commit e6a40697. Reason for revert: API review comments Bug: 148179277 Change-Id: I729e1c27492b25cfcdb4244e294672ba34a7e7ea