Merge "Don't throw a NPE in SharedLog#e" am: bc5c593e2e
am: 812286cd84

Change-Id: I6656b30168ab78970cdbcf5d04b4be96303a0040