Merge "Fix new compiler errors." am: 32290d3463 am: fb8ce21007
am: 3a84b0330b

Change-Id: I08137ff6f275c2ea7e32b0e3419b913129af1117