Remove warnings

Change-Id: If007520c22d400b717fe0abac30b8288208e3e94