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

Change-Id: I4924052680b49a560c63296c99b9a16cd55c30a9