GitLab

Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908

Bug: 23290056

(cherry picked from commit 4eeacbee)

Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b