Merge "Fix reversed logic"
am: 946e857c71

Change-Id: I22194d1d2923170a224ad6d782dd8155e957ebe3