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

Change-Id: I508c001b2b2e3930d5e1ed5983eed4b73f7658ff