Merge changes I5a3584b6,Ic7252a8e,I2d4ace75

* changes:
  Various minor policy fixes based on CTS.
  Split internal and external sdcards
  Give sdcard sys_admin capability.