merge from tools_r8

Change-Id: If3f0a5d9b487e23c8f28fc4db676b0cb70d09c5a