Update the last commit to its current patch set from CM

Change-Id: If6317a2c410595bfcb51e68df1aaa047a215bc88