Energy at the centre of Australia-Japan overhaul plan