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

Change-Id: Ia5c723b29c2f6a34f39d67d482ee7f4f74b65418