Merge "Added fixing of log.h errors" am: 3931e177ad am: c1b7753244 am: 0ba2287d20
am: 725ea78238

Change-Id: I8e88b2a56b4da9b08e8430955db7e1419828061f