Merge "logd: cap out-of-order entry search" am: b15882faab am: 1b559e2f8d am: 3cb28fd064
am: 5adcb3e3e7

Change-Id: I1719ff6931c76a83d2a8bae9b299c8d47e1091ac