This reverts commit 55a6841843. (cherry picked from commit 363ed1a6b09d7426bfd3726becd2d713da57fa80) Change-Id: I19153a904dd7587dfd517dcc86f51f4b1110289a
55a6841843