This reverts commit a044235272.
This depended on CL: https://googleplex-android-review.googlesource.com/#/q/I2907b182e19b3562592da688b3f68ef5f4088557 which was not commited yet.
Bug: 13756871
Change-Id: Ib05c58002a06c7882c4b6dfd750c9681ff4b1646
This reverts commit a044235272.
This depended on CL: https://googleplex-android-review.googlesource.com/#/q/I2907b182e19b3562592da688b3f68ef5f4088557 which was not commited yet.
Bug: 13756871
Change-Id: Ib05c58002a06c7882c4b6dfd750c9681ff4b1646