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

Change-Id: I53d99edee6729b753707db251e252297b927d2a7