Fix Repopick Errors

Fixes errors after the gerrit update yesterday.

Change-Id: Ie2a9a4371af682056acc7cdad5426e40f0f2504c
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0