This reverts commit bba8ec0d43. Reason for revert: Broken tests b/190622577 Change-Id: I8d15b626fcd8da67094ebf461d381b3922f69024
bba8ec0d43