Update commits for 1.8

Change-Id: I266821df44196169ce553953c4ce86fd103bea01