Merge "Send error if ONS is not available" into qt-r1-dev
am: b5bf60eb09

Change-Id: Ifb13364e194a178612d74314424904eb8eeee01e