Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9

Change-Id: Ib835a71df1f54be8544e4d85f872dd9e43defcba