Reverts commit f5f14acba3 Bug: 228137694 Bug: 221113300 Change-Id: I683092796f5de0476e09692897d80a3655ae6925
f5f14acba3
c0231f8d0f
f58691ae42