... instead of defining the omit options multiple times. Change-Id: I14c921454dd50854da64bd1ed039d0cdcbb27f75