Update for AOSPA
Add Xperia Settings