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

Change-Id: I0d4d873becfa55352b567a917a0551f032765584