This reverts commit 0faf2b87. Bug: 28610953 Bug: 29395357 Change-Id: I609fe344dfc61311e37b91b48480d9392764a598