Mark internal storage as primary.

Change-Id: I5a985dbddd7010db80c07202ae7811f0d99d0a13
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1