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

Change-Id: I7989d3d9402c3e96a459f1bb72b5eefa0f320f02