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

Change-Id: Ieef7a9ad258d3c783f833521e5d52754b8d3366c