Fix warnings from static analysis tools am: 3595523fd8 am: 4fc3150d2b am: bf1094f552 am: 278d8b522b

Change-Id: Ic4bee57eff757ad44c4c6dbe21c042117dc62dc8