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

Change-Id: Ib5f483ddb67d18c95c720088f9b0ed1c64b65979