This reverts commit 58391261. Reason for revert: <Culprit CL candicates of b/172618099> Change-Id: Ifd0098337e4a4cec5486a6b02c12d179c07baf93