Additional overrides

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