This reverts commit bd7eef17. Bug: 24467386 Bug: 20037935 (cherry picked from commit 39becb96) Change-Id: I3ebdc669dc3085570bb534dce710712bf3ed25e2