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

Change-Id: Ibe862f5dd873679c9df323b9cc80f91975b8a4b8