Merge "Correct placement of 'Select all'." into arc-apps
am: 390cd78b43

Change-Id: I4ccf97735d48e244e23c4174d825285dac1fdd15