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

Change-Id: If78ba5b1852d6c717851d443321f7ff3e9bb4cb2