base

Fix the false-alarm bug when we skip to the end, which should be OK.

Fix the bug b/4540617.

Change-Id: I64a77b8c5d89bcd35f81d196928a671c954e9a28