DO NOT MERGE: Backport of "Use mailbox lookback (if available)..."

Bug: 4279927
Change-Id: I6da81ee09263306c9c897fb0c0d43f75dad478e2
1 file changed