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

Change-Id: I79fece32a43e104bf5409a6e175c82035a2cb448