Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d
am: 222dca470e

Change-Id: Icd722065f9256e7afec3e3d7f53c2aa5340856d8