Change-Id: Id830fbe2d44f083c88765561b6c07c5689afe5bd
* hc to satellite rename * rebase with master and fix spelling * missed out rename * rebase merge fix