This reverts commit 04073dc5be. Bug: 29128683 Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
04073dc5be