This reverts commit 41ef8b376f. Test: Manually tested Bug: 34247671 Change-Id: I0510009b2deac784770f26059681b1980800abc8
41ef8b376f