Custom scanning return message

Change-Id: I76cfa73f0e3880839b110467c6362080c930cfc6