Fix compiler warnings. am: 666b76bf84
am: 7c9b5f0978

Change-Id: I35b21c71660da91ff3f7f20e05878a4c33e89402