Merge "Fix questionable condition"
am: a74f830091

Change-Id: I5e76c3e41bb6b4b236ba6fad6cd2e3dda2c95bdb