This reverts commit 7c4395804e. Bug: 27683276 Change-Id: Id1a310b57ab7fa3c8c14b464786473f211eaf41f
7c4395804e