This reverts commit dcdf300a1f. Bug: 27580174 Change-Id: I49780dc522b5d1c4939749fe0d38124821f67c12
dcdf300a1f