merge from tools_r13

Change-Id: Ia71bb88cacb09eccdc6281897bcc324487a23b01