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

Change-Id: I60b13b493cde64c7d202ba28534bca227f6d4941