Merge "Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1f am: afb8f377 am: 2e73b06f am: 0fc7044d"