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

Change-Id: I77a820659804ab30a892d9e748439c9e1c5126df