This reverts commit 79a19effee. Bug: 129975435 Change-Id: I113c87f8c0b7ab225e4b99ef2462ae12e199b816
79a19effee