Use combined didyoumean

Change-Id: I29c4bc812fe2cda70c670618ce9cc7edde4f3883
Merge "Use combined didyoumean"