Merge "Remove empty generates clause." am: 12517de51d
am: 4160ed79a0

Change-Id: If4e18de85815193dc6de6b2184b6ffddee68505c