Merge changes from topic 'jvmti-field-cbs'
am: 18b4ed19eb

Change-Id: I5ffe1630f3743c9ac4c1839d934ee6cd92298f0e