Merge "Minor upstream selection refactoring" am: 12fe022fbd am: 2cb58deb7b
am: 3e402328d5

Change-Id: I6ee263014ad42f7e195cd5d1806916a5c3ef18e0