Merge remote-tracking branch 'upstream/lp5.0-caf' into lp5.0-caf
Merge branch 'lp5.0-caf' of https://github.com/Validus-Shamu/packages_apps_Settings into lp5.0-caf