Merge "Remove warning header from safe_union." am: b55885bcc8
am: f4bc662d93

Change-Id: Ibf4b5b53a050044a14848b53ea88c392851a8dc9