This reverts commit f5d99fa7d9. Bug: 112064298 Change-Id: Ib2b595f8f98a577af205d5169af28a185ef00f03
f5d99fa7d9