Bug: 74121887 Still failing :( This reverts commit 642e9d82. Change-Id: I603ca9fdd2d8f2f759527130b3288efe5b23b5c3