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

Change-Id: I0bb636dc921003239f736aa1db91d1ef8c7f8937