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

Change-Id: Id71496109da78a92803c2798bcc4c55411dc4fee