Just a few more for flexibility

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