GitLab

This partially reverts commit d6c95539,
https://googleplex-android-review.googlesource.com/#/c/380591

- That CL ended up being a dead-end

Change-Id: If222806eebbe304fc614e17fa064c1580f5e3ee7