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

Change-Id: I1a78de2bfa2aa13c757f8bdae2627f69b9d60f74