Merge remote-tracking branch 'origin/upstream-master'

Initial merge of upstream cxx

Change-Id: Id152535f58e3bdc563a0beea2e28eb7438881a63