Fix build warnings

Change-Id: I79f4d7052a4c0a9fde144063f44a9c8c9dd575d5
2 files changed