When looking up metadata for WiMP, don't forget to add the
trackId which triggered the lookup.
Fix condition...
Merge branch 'public/7.7' into public/7.8
Merge branch 'public/7.8' into public/7.9

Change-Id: I66a26bb9058447b1875688439045caa41c2b260e