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