Port changes from SettingsGoogle

Change-Id: Ie55e6f1415e33b20fc393cdbb92c806d757afc1f
Signed-off-by: Ayan Mukherjee <mukherjeeayan725@gmail.com>
577 files changed