Merge "C/C++ adjustments and bug fixes." into oc-dev
am: 56d4fb84d6

Change-Id: Ic710e14a77d2b70656abc2e53b9c7aa8ce08e4ca