Correct conditionals and group sources by experiment flag. Change-Id: I52f38a0c8fdd52f840e67584de3bca24d4af597d