This reverts commit d8e0c0d6. Test: manual Bug: 243385408 Fixes: 265999334 Change-Id: I60f697c3091f9bbd490c9cfe6cf79996d0715351