Merge "Update account sync settings title." into oc-dev am: a031636725
am: c669438450

Change-Id: I5a163d5e3902c04f1006a15e4a330f55f6af0ef9