This reverts commit 624b68ec. Bug: 28406866 (cherry picked from commit 33bae7d5) Change-Id: I4d6d6791b286cfeecaeebc388684ee8d3c44a920