Merge "Fix anonymous struct and union warnings" am: 87e72cb237 am: a3ac6c2b86
am: 86eff80c19

Change-Id: I6358d387eebddcd9238f250db7429f5846a2260a