This reverts commit 96a522037f. Bug: 76145463 Test: m Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
96a522037f