This reverts commit 3edc43234a. Bug: 27580174 Change-Id: I42dac32eb7a70498accf2b8b4fde1ed0d221ca0b
3edc43234a