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

Change-Id: I4e0387bd7d21a368bab1cc9c4e176fa2ad199db7