Merge "Removes gnu designated initializers."
am: 594952f2a2

Change-Id: I9b6cf8060c2725d00e61ae282c049a668b699c17