Merge "Fix compiler warnings." am: 2623d1370f am: 8f7122a989
am: 28d9d65ffb

Change-Id: I981642310f1a0b7b49315d437c47a8070747fe6d