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

Change-Id: I96cf3364a60641823caf144a856d0fecb2bdfe64