Merge "Fix static analyzer warnings." am: 5b843179ff am: 96e489dc8d
am: 369b2032f5

Change-Id: I1a3b4c55cc00553b38b5f817f5084e6082d86497