Merge "C/C++ adjustments and bug fixes."
am: 1da84f09d2

Change-Id: I419c7b8ab3ebc149790344681ab3c1e7fa669f6c