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

Change-Id: Ie42a4361d51ee489edc1357063516509cacddc0f