Merge "propogate heartbeat error code to app" into lmp-dev