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

Change-Id: I097f4796231ff8f5083f0f78f378da7b7f262538