Merge "Fix build warning" am: 1e42dd3e47 am: ebcb611743
am: eeeb77f8b0

Change-Id: I7a82b1a70cd8d21ecc0d8fbb25bdd728d8a016a6