Merge "Merge "Fix a static-analyzer warning." am: 63b4f6f5db am: ea4423b181 am: 281e9f30c0"