Merge "Suppress a static-analyzer warning" am: 883b34335e am: 39f89c6526
am: 86ae67d393

Change-Id: I2daa1f9e255aae786eeeb34f1578cdfca371cb8e