This reverts commit fe4e80b98b.
This change is covered in https://googleplex-android-review.git.corp.google.com/#/c/1075489/
Change-Id: I4a9cf9f5199f315d2512ef211c8e617090acf244
This reverts commit fe4e80b98b.
This change is covered in https://googleplex-android-review.git.corp.google.com/#/c/1075489/
Change-Id: I4a9cf9f5199f315d2512ef211c8e617090acf244