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

Change-Id: I3580bd93dca6c863a11435c0fc4fa5bf25f51067