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

Change-Id: Idc7e4d749a8837f046cee4651ef07af655221771