Merge "Minor upstream selection refactoring"
am: 12fe022fbd

Change-Id: I1984cf520c04cdc2751dca3d6029793a257a1592