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

Change-Id: Iae9b7033032bc381110ed11e9a99ab450f47704d