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

Change-Id: I0be82ec64a61f015a34ded70202c422e43825778