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

Change-Id: I57d1b50eea3a31fae57bd20f856a0ebc53e73357