Make common log import consistent

Across the project, make the common log import consistent.

Change-Id: I937cd5d337db5d2296dd9238685803bbba3391b3
Merge "Make common log import consistent"