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

Change-Id: Ib38b93b0c35ec8c0ca7e452b283a4059b220e423