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

Change-Id: I93a9b7b1f48953ec52d6c0f23e3141ddf6dc30f3