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

Change-Id: Id0d6dd6f2a6cd263cd593d6d8bd5760ccb5eaf2e