Merge https://android.googlesource.com/platform/packages/apps/Settings into jb-mr1