Merge "Skip track if verification fails" into klp-dev am: ab2c5046 am:...

Merge "Skip track if verification fails" into klp-dev am: ab2c5046 am: f2334151 am: 87f1a304 am: 222dca47 am: ff9e1b03 am: 6d050827  -s ours am: 84b2e071  -s ours am: 0a782680  -s ours am: 8d68455f  -s ours am: 369ad623  -s ours am: 920df6ca  -s ours
am: e21ab964  -s ours

Change-Id: I00ac4a069a160f16600d081e2be3e97f7513a92f