Merge "Usage suggestions." am: 51c2088f3b
am: 79c5de4d4b

Change-Id: I85a87d3f66387b4188b5252e0237c2e1b071c304