This reverts commit d8ca8922e3. Bug: 34104268 Change-Id: I8d29b1044f9fac378641f093f6d2b69e50a463e9
d8ca8922e3