This reverts commit 2e0e32f9f7 Change-Id: I1362839633bca4260d83f470a780d93b8de431ca related-to-bug: 7216099 related-to-bug: 7223566
2e0e32f9f7