merge from tools_r6

Change-Id: I6db896a231718a1e7ab879676af4c0d4e26c5950