This reverts commit 7951ceb0d1b13c430ed72a8a9d92b66f757e5cac in favor of https://googleplex-android-review.googlesource.com/#/c/296692/ Change-Id: I3df44a78f63240f79a047c04be067d9eaf85e303
This reverts commit 7951ceb0d1b13c430ed72a8a9d92b66f757e5cac in favor of https://googleplex-android-review.googlesource.com/#/c/296692/ Change-Id: I3df44a78f63240f79a047c04be067d9eaf85e303