Merge "C/C++ adjustments and bug fixes." am: 1da84f09d2 am: 79d445255b
am: 086b7fdea9

Change-Id: Iae9439337534cc84788f26a8d78526db90b638b1