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

Change-Id: I425f1cb0e32cd3202fc96d9a73ed99754e18ba1b