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

Change-Id: I413a4e86233f103767c24b636212faf3fba3dcf9