Merge "Suppress a static-analyzer warning"
am: 883b34335e

Change-Id: Idccd2227cef2793cf3c40e93f11046fa217d7dee