This reverts commit e96b5668. Reason for revert: Feature has been postponed Bug: 151761909 Change-Id: I7db5fb79d52b3da33b84bb07d1f612be760299c2