Fix warnings

Change-Id: I1ba5c871a1cb44df8c383f595cbe6d75fef02aa3
2 files changed