
Bug: http://b/20065774 This reverts commit 76e1cbca75e9fdaf7a7943f2c58e65433b283f4a. (cherry picked from commit 7c2c01d681d7f2faa256a263996a35ac3edc94b3)
Bug: http://b/20065774 This reverts commit 76e1cbca75e9fdaf7a7943f2c58e65433b283f4a. (cherry picked from commit 7c2c01d681d7f2faa256a263996a35ac3edc94b3)