Merge "Remove GCC-specific pragma and disabled Clang warning" am: bcf27fa6a7
am: 48a80c1a27

Change-Id: Ib564870756d7dc89c7e65c9fa50439a65cd3f115