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

Change-Id: I8fc2acbf9bbddbc4a401f51595752351c06acc79