Merge "Remove workaround for repo."
am: f877c165de

Change-Id: I44192c8e268409654b5c6655d136f0592f9c0501