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

Change-Id: I38e5ae45797364a7af1b4aee37179bdef200f354