Merge "Fix reversed logic" am: 946e857c71 am: ae6248d35b am: 6f1a7d3c10
am: 4559d83655

Change-Id: I6e10b29bfddc5d3f7d4b04d81ab7b610261bebc1