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

Change-Id: Ia459eab9db6ecb6558f868495189655146025f9b