Merge "Fix compiler warnings."
am: 2623d1370f

Change-Id: I0905307275eb260a5ec762aa1ed101c00db36468