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

Change-Id: I1ef13752952b273c754dee8c4b9b86e2ef75e397