Merge "Fix clang static analyzer warnings." am: 411414c916 am: c95b45c72f am: 37146b7b02
am: ef5e1bb46e

Change-Id: Ia9ca864825904017a05c502a15ce970802ea4dc3