Merge "Fix compile time warning." am: 5c6e4acbe1
am: 317da495e0

Change-Id: I00c265e52ce90d59c9210057ad77ab44b806d59c