Merge changes from topic 'HS2 API Cleanup'
am: 41fd0f1faf

Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382