Avoid possible build errors

Change-Id: Ie99d9db882f6f98bcfaf25ff8611734d2b757bbe