Merge "HintManager: Fix verbose message output" am: d790ec4c37 am: fc21a735f5
am: e8da377cff

Change-Id: I34288700e567b1137aa4c9cc0c6c75bbdbfabd38