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

Change-Id: I175a18d302528423c80c05ab18c3e3130761d7e0