Merge "Usage suggestions."
am: 51c2088f3b

Change-Id: I4e928f1194d89ba0a3c0dc85079dbd7bd30f0e49