Remove tags where not necessary to simplify Jenkins job configuration

Bug: 47550
Change-Id: I8e1bb7c62f570f846d8099c1250f414f3b20c9d6