Merge "Merge "Unselect track to not affect next selected track" into kitkat-cts-dev am: bef07bc479" into lollipop-cts-dev
am: c8e62ae0fe

Change-Id: I2d5c66e800587811c95a6b4c2f36dd52c7811471