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

Change-Id: Ie0e8344446e894f218ffa7d9d7c3ae1493c6a89b