Prep for 3.8

Change-Id: I4711c12755c2e6c059a5ff97578fde431cc74cce