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

Change-Id: I4f64cc383423f435d26d97d215fa2d72c1e463e6