Merge "Make SelectTest append selectTest argument from extended class" am: 96cf453355
am: bf2309beae

Change-Id: I068d7b920796ac90f756bfcba6cf51e046ebbff3