Merge "Fix compiler warnings." am: 8ef5c3d274
am: c6b02f7802

Change-Id: I100ebf1d7aecc903fd19a7cb871a34d149f35224