Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev am: 95089be460
am: e0cb0dc2c8
Change-Id: Ia51c7aa3ef09f2f0780766c2b9fa515da4c8d4d9
This commit is contained in: