This reverts commit d1a10c62. Test: m checkbuild Change-Id: Ie009a522300274d0bfc9a9a0a2d09cc425dbe665 Merged-In: Ie009a522300274d0bfc9a9a0a2d09cc425dbe665 (cherry picked from commit 7ee67e34)