Additional overrides

Change-Id: I768e26d2fad021a9eb30decf15e61ba996b673e5
Just a few more for flexibility

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

Conflicts:
	core/Makefile