Editor hints are improved (#13281).

Change-Id: Iacc659f779f9c6d7615f9ef82ea55a77f5826d0b