And fix an issue that phan found. Change-Id: I91cb562ac674b02bb84c6c1da4236810f6a3aa3c (cherry picked from commit 2beae377e7)
2beae377e7