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

Change-Id: Ibe40285165474b2d630a68a43ac82b43411f8bfc