Merge "Skip track if verification fails" into klp-dev
am: ab2c5046ef

Change-Id: Ica76922fc399fe0e5b6af23d613a2f6e5bc7820b