[automerger skipped] Merge "Fix questionable condition" am: a74f830091 am: 199a5a690e am: 8fa6247f55
am: c49b73ca8f  -s ours

Change-Id: I46ab4af862de6d934300b045bd1621a1740d784f