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

Change-Id: I6c2af055a2c4dc84bc79a37cbae10960626bc86f