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

Change-Id: I7f4c483e485f4325df4c93e619ff2bf3fb6f183e