This reverts commit e9cae495. Bug: 28406866 (cherry picked from commit c0f2e678) Change-Id: I806cec1a6baab8722262082a6d3db1ac3734a8ab