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