Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381
am: 62fcf9369f
Change-Id: I7aa60f53cf44d5090a648551ef2ff02431981ff0
This commit is contained in: