This reverts commit afedf3bd. Build failure fixed. Change-Id: I46e7e222c2b5bfa5b1846f3fe87444afb70f1b31