Merge "Fix questionable condition" am: a74f830091 am: 199a5a690e
am: 8fa6247f55

Change-Id: Ie3d62cd0380b80ba5bdcef405fb9a8739574a760