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

Change-Id: Id16c294254281a589860a5dea6a4c8d8f38680b0