Merge tag 'android-4.3.1_r1' of https://android.googlesource.com/platform/packages/apps/Settings into jellybean-4.3

Android 4.3.1 Release 1