1.7 release candidate 3

Change-Id: I789c35bb462cf3821a76953d676dce0769ffc0e7