Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours
am: 8d68455f69  -s ours

Change-Id: I0d67f4871aea0df136ef7e26bfb7e7b9d0eadfc1