Merge "Leave one more register for clang 7.0."
am: 0e7d8dd81d

Change-Id: I9bbb654c900be5aeb3569498bbad8da3b5f31b77