Change up superuser settings - fix root

Change-Id: I7faf12a29271731c5baaa4c78fa8e503d456c7b9
Merge "Change up superuser settings - fix root" into lollipop
Add missing title for notification ringtones

Change-Id: I86484e5ae58e4c19398f368907d1d80ff16dab71
Merge "Add missing title for notification ringtones" into lollipop