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