Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303
am: 6d050827c3  -s ours

Change-Id: I192b34239fc52c5532a0ea4ce71fc110639d462f