Merge "Fix static analyzer warnings." am: 9c69c41b95 am: 4cfb0f020f am: 6ab25ba5f1
am: cf1a558aed

Change-Id: I4e2608df649dfd3384aadd1f69d88ffc69bf7ea9