This reverts commit 2bd0efa89c. Bug: 27932087 Change-Id: Ie27f17c1f283514b90ce9da0c895b528d87e5f47
2bd0efa89c