Merge "Clarify hasSelection description" am: 6bd5cf2bcc am: 0e63b9ce98
am: 8331efe0af

Change-Id: Idb4ac0cdc786ff080a998ad48fe54e803d58cc4d