Merge "Made changes to menu items in WifiSettings and AccountSyncSettings."