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

Change-Id: I73dc7e47baecddf4d9df119b324aad3fe0bbf144