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

Change-Id: I7a650b2c111c83de6db116fa2028a7b9e9941914