Merge "Fix static-analyzer warning." am: 2fbf30d3fe
am: a52992e290

Change-Id: I62bfb1ff3218a9f790b1858d6d6013a93ffbe008