1.3.9

Change-Id: I94c4deb5c024393c615c0b53d56e10da51586720