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