Merge "Fix an incorrect CHECK in the code." into pi-dev am: d79fe0de75
am: e93c26858d

Change-Id: I5ada3973209a17443fed7f4d8ddb3c1a042aa1c5