Merge "Fix new compiler errors."
am: 32290d3463

Change-Id: I19a3df52ae096b2965e01b46e3d3c44258968a97