This accompanies: https://googleplex-android-review.googlesource.com/217002 This reverts commit e9adc27111 Change-Id: Ib37b72c59aad34fe9fd4461979c5f51af1218e37
e9adc27111