Bring sonar and pressure_hight to android branch