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

Change-Id: Ibc603eaa5413040eb5bf090c21f88132836ba624