Merge "Fix reversed logic" am: 946e857c71
am: ae6248d35b

Change-Id: Ib0b74cf49e7a14e96d1996a55ec4e13667d94567