Merge "Fix an accidentally reverted condition" into pi-dev
am: 7c3c4d38a9

Change-Id: Ib99b815996d5dc7168f9f9fcd4cd09651a5a5fc9