Unbreak merge failures

Change-Id: Ifc0141f1d594e1f5e04ee8532c985e6b3d480fb3
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2