Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5
am: 1e3070e56d

Change-Id: Iefa80b90d92ab9f14364eeb77b5cb2608f919496