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

Change-Id: I349d3c9affcea1af9b2879e310342a92bceb0987