Merge "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" into marshmallow-cts-dev
am: 271f4cc6c1

Change-Id: Ia48ca4b21a612662d7d44672f7701886a42236e8