Merge "Ignore new compiler warnings" am: 12abeff103 am: 47f0bb4b8e
am: 1cf65b9013

Change-Id: If76f933bd0268cc68bc0544d9c829c5ec6d0173c