Bugfix release 1.9.39.2

Change-Id: Iba3aa6df3547743a1b04d810d2d4bc021246529a