Not sure where these deltas are from, but apparently we got out of sync with garwynn. /pray

Change-Id: Id30c0d648bb7c682f3b5380f6c84280f18268573