Merge "Remote reference to log/logger.h"
am: a5cfc8b1e6

Change-Id: I575b0fd3c82b548be50519c68be254a34d344f67