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

Change-Id: Ib9d9b6d609adac43fedb0ab4c13d5b2152997536