Merge "build warnings" am: 90f3dcf315
am: ff1995bbe9

Change-Id: I452a906b6c8da279b36b094acba93ada222b27c4