Merge "Removes gnu designated initializers." am: 594952f2a2 am: e72d1d1206
am: 9e36579d55

Change-Id: I935317b76902e6f7554108d817226be32c5e87d8