Merge "Remove unnecessary warning flags, now that the warnings are fixed." am: e3fd73e1c8
am: 5e3c7bd6d0

Change-Id: I396705354c8e8ab7c19e5ce7a5aac869c802411d