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

Change-Id: I2f61aa7a5fc6771c5650a04971e65b8fe57161c3