Merge "Fix warnings from static analysis tools" am: e83baccd6f

Change-Id: Ie9064e627f8969c43e8a86f37518fc8afa656937