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

Change-Id: I32576e14d8fe8c6c785ad1bba7c35dc0ac4ac18e