Merge "Relax SharedLogTest asserts" am: 91464bfe68
am: 541079e0d7

Change-Id: I7a584c155915196c9b6b1a856141a3d9ab5699db