Merge "Fix compiler warnings." am: f1b6c7d504
am: 415f010518

Change-Id: Ic1899df7c76b9d5851055e2a1754e92bce7e5d81