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

Change-Id: I9868806741e17c23e8c9ed34e753062733af190e