Merge "C++17 compatibility: `register` is no longer a keyword."
am: d5c9ae2bd6

Change-Id: I861a910a3a231cbeec794b8bf2722e04499758d8