weekly 7.5

Change-Id: I9095bed5773f14c9d5f57833860e848179fd4500