merge from tools-r6

Change-Id: If11d893ba56c1189620e00f86b7f51bf4d698e49