am f5c7ffc1: am e03298ed: am 82f6d0c9: Merge "Add typecheck C++ API test to verify proper behavior." into klp-dev

* commit 'f5c7ffc1122b7f08b0282fc700e65bc20907e0a6':