Merge "Fix compiler warnings."
am: 8ef5c3d274

Change-Id: I7fea2dbd584e7827286d3f17de33e96e8ff5faa4